Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

kvserver: remove unnecessary condition #106061

Merged
merged 1 commit into from
Jul 10, 2023

Conversation

tbg
Copy link
Member

@tbg tbg commented Jul 3, 2023

The !reproposal condition already captures whether this is the
first time the proposal is seen in that method. The other condition
added only fear, uncertainty, and doubt.

Epic: CRDB-25287
Release note: None

@blathers-crl
Copy link

blathers-crl bot commented Jul 3, 2023

It looks like your PR touches production code but doesn't add or edit any test code. Did you consider adding tests to your PR?

🦉 Hoot! I am a Blathers, a bot for CockroachDB. My owner is dev-inf.

@tbg tbg requested a review from irfansharif July 3, 2023 13:50
@tbg tbg marked this pull request as ready for review July 3, 2023 13:50
@tbg tbg requested a review from a team July 3, 2023 13:50
@cockroach-teamcity
Copy link
Member

This change is Reviewable

@tbg
Copy link
Member Author

tbg commented Jul 3, 2023

Uh oh, a bunch of stuff failed, maybe those are unrelated flakes but I sure am nervous they're not.

Going to look into them before I proceed.

@tbg
Copy link
Member Author

tbg commented Jul 5, 2023

I think it was just flakiness and not related to this PR, since it now passes (and I added an assertion, which doesn't fire).

I have some other PR in bors that will cause a merge conflict though, so holding off a bit more.

Copy link
Contributor

@erikgrinaker erikgrinaker left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, but let's remove the assertion, or downgrade it.

The `!reproposal` condition already captures whether this is the
first time the proposal is seen in that method. The other condition
added only fear, uncertainty, and doubt.

Epic: CRDB-25287
Release note: None
@tbg tbg force-pushed the address-todo-proposal branch from f502712 to 6cf66d3 Compare July 10, 2023 10:29
@tbg
Copy link
Member Author

tbg commented Jul 10, 2023

LGTM, but let's remove the assertion, or downgrade it.

Removed.

bors r=erikgrinaker

@craig
Copy link
Contributor

craig bot commented Jul 10, 2023

Build succeeded:

@craig craig bot merged commit e2327d0 into cockroachdb:master Jul 10, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants